- added am patch (fixes build with automake 1.13)

- rename sr@ije locale to sr@ijekavian
- release 2

diff --git a/gtk+2-am.patch b/gtk+2-am.patch
new file mode 100644 (file)
index 0000000..66c535f
--- /dev/null
+++ b/gtk+2-am.patch
@@ -0,0 +1,20 @@
+--- gtk+-2.24.14/configure.in.orig     2012-12-06 04:46:07.000000000 +0100
++++ gtk+-2.24.14/configure.in  2013-01-05 23:22:13.182460350 +0100
+@@ -51,7 +51,7 @@
+ cflags_set=${CFLAGS+set}
+ 
+ AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ # Support silent build rules, requires at least automake-1.11. Enable
+ # by either passing --enable-silent-rules to configure or passing V=0
+@@ -300,7 +300,7 @@
+ 
+ # Checks for programs.
+ AC_ISC_POSIX
+-AM_PROG_CC_STDC
++AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET

diff --git a/gtk+2.spec b/gtk+2.spec
index 744d2250c5ead066300c7fe1092203ae1750ca07..071b3ae75c16b841deaeb5534c82637829fff102 100644 (file)
--- a/gtk+2.spec
+++ b/gtk+2.spec
@@ -15,7 +15,7 @@ Summary(pl.UTF-8):    GIMP Toolkit
 Summary(tr.UTF-8):     GIMP ToolKit arayüz kitaplığı
 Name:          gtk+2
 Version:       2.24.14
-Release:       1
+Release:       2
 Epoch:         2
 License:       LGPL v2+
 Group:         X11/Libraries
@@ -25,6 +25,7 @@ Patch0:               %{name}-arch_confdir.patch
 Patch1:                gobject-introspection.patch
 Patch2:                %{name}-papi.patch
 Patch3:                cups-auth.patch
+Patch4:                %{name}-am.patch
 URL:           http://www.gtk.org/
 BuildRequires: atk-devel >= 1:1.30.0-3
 BuildRequires: autoconf >= 2.62
@@ -251,6 +252,7 @@ Moduł GTK+ do drukowania przez PAPI.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,/usr/bin/python,' gtk/gtk-builder-convert
 
@@ -309,6 +311,7 @@ mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0{,%{pqext}}
 # for various GTK+2 modules
 install -d $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules
 
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr@ije,sr@ijekavian}
 # unsupported by glibc
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{az_IR,io}